From: Gert Wollny <gewo@debian.org>
Date: Tue, 20 Jun 2017 21:52:09 +0000 (+0000)
Subject: add patch to include localcharset.h correctly
X-Git-Tag: archive/raspbian/3.6.9-4+rpi1^2~234
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/%22bookmarks://%22%22/%22http:/www.example.com/cgi/%22https:/%22bookmarks:/%22%22?a=commitdiff_plain;h=9ba20764c80ca21b3947d2b179a3633753a01446;p=dcmtk.git

add patch to include localcharset.h correctly
---

diff --git a/debian/changelog b/debian/changelog
index 264e145d..bf82a5b1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,8 @@ dcmtk (3.6.1~20170228-1) unstable; urgency=medium
   	- correctly enable ICONV, Closes: #701802
 	- enable C++11 build 
   * d/control:  add libunistring-dev
+  * d/p/: Add localcharset-include.patch to corretly include 
+    localcharset.h
 
  -- Gert Wollny <gewo@debian.org>  Tue, 20 Jun 2017 18:58:39 +0000
 
diff --git a/debian/patches/localcharset-include.patch b/debian/patches/localcharset-include.patch
new file mode 100644
index 00000000..8590a907
--- /dev/null
+++ b/debian/patches/localcharset-include.patch
@@ -0,0 +1,11 @@
+--- a/ofstd/libsrc/ofchrenc.cc
++++ b/ofstd/libsrc/ofchrenc.cc
+@@ -288,7 +288,7 @@
+ 
+ #include <iconv.h>
+ #ifdef WITH_LIBICONV
+-#include <localcharset.h>
++#include <unistring/localcharset.h>
+ #endif
+ 
+ #define ILLEGAL_DESCRIPTOR     OFreinterpret_cast(iconv_t, -1)
diff --git a/debian/patches/series b/debian/patches/series
index ab7e6efe..59fd2928 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -7,3 +7,4 @@
 07_dont_export_all_executables.patch
 08_remove_system_processor.patch
 
+localcharset-include.patch